* em-term.el (eshell-term-name): Default to term-term-name. (Bug#12485)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a75bbe8ba9c2ed25a097350cef634ba82c7c14cd..86aec0622b7869c4403679be31a3248b2a638246 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,12 @@
+2012-09-25  Glenn Morris  <rgm@gnu.org>
+
+       * eshell/em-term.el (eshell-term-name):
+       Default to term-term-name.  (Bug#12485)
+
 2012-09-24  Fabián Ezequiel Gallina  <fgallina@cuca>
 
-       * progmodes/python.el:
-       (python-shell-send-buffer): Better handling of "if __name__ ==
-       '__main__':" conditionals when sending the buffer.
+       * progmodes/python.el (python-shell-send-buffer): Better handling
+       of "if __name__ == '__main__':" conditionals when sending the buffer.
 
 2012-09-24  Glenn Morris  <rgm@gnu.org>
 

diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index 37fa939cc1027dad5e2508ed8c2bea6d99d0b99e..ef59f6d1d35dfe219158d4cddceb94eca84531b4 100644 (file)
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -63,10 +63,13 @@ which commands are considered visual in nature."
   :type '(repeat string)
   :group 'eshell-term)
 
-(defcustom eshell-term-name "eterm"
+;; If you change this from term-term-name, you need to ensure that the
+;; value you choose exists in the system's terminfo database.  (Bug#12485)
+(defcustom eshell-term-name term-term-name
   "Name to use for the TERM variable when running visual commands.
 See `term-term-name' in term.el for more information on how this is
 used."
+  :version "24.3"             ; eterm -> term-term-name = eterm-color
   :type 'string
   :group 'eshell-term)